Changes to core of JSON api.