Added response field names and small fixes