Made some changes in data manipulator