Refactor of JSON Classes...