Added more case lookups for field names matching