Refactoring of Manipulation class and some docs