JSON refactor complete