Changed order of JSON response fields for readability