Add support for db field names with underscores