Removed hardcoded json field names.