Removes hard coded mappings and adds field configuration