Refactoring and partial JsonManipulator logic