JSON Util refactoring