Refactoring and added functionality to DataManipulator class