Corrected json mappings for rest api