Added manipulator suppor