Removed old version and standarize
WIP Defining manipulator api