Added more manipulation tools