Most use the 2nd type. They come with the M54DS pump. I have one still in the original plastic bag it had when I bought it. Don't even remember ever buying it. But I obviously did.
Will sell for $12 shipped USPS to the lower 48, in a padded envelope.
https://www.ebay.com/p/Engine-Oil-Pu...d=183748512280
http://forums.maxperformanceinc.com/...41&postcount=1