Upgraded JSON-API