Add Functor instance for IntPSQ and PSQ
Merge add Functor with master