Add support for database field names with underscores