Started refactoring JSON