Beamshaper for q3?

I'm enjoying my CR2 Ion so much that I've started looking into the possibility of getting beamshapers for several of my lights.

Is there a beamshaper that will fit the q3?

How about one with a spring loaded mechanism like these?
http://www.lapolicegear.com/suf70be.html
http://www.fox-intl.com/searchresult.asp?id=3010

Beamshaper seems to only bring up surefire products.... are they called something else for others?

At the risk of a laugh, the transluscent caps from Deer Park .5 liter water bottles that I mentioned the other day fitting on L1P and L2P heads also fits my Q3 even more perfectly. Works great as a floody diffuser. The Fenix lights fit into an inner seal ring, the Q3 fills the entire cap and is very snug. Cheap and dirty but effective. You can also put the cap open-end down on a flat surface and stand the light on top of it. Works better than just using the crenelated crown to light up a small area. Even better with the Fenix since they don't have openings at the crown if you're somewhere with no ceiling to bounce off.

The Surefire F04 Beamshaper fits the Q3 and most 1" lights.