Corrections on JSON Mapping