added support for user mapping of fields