added support for database column names different than field names