Added manipulator functionality