better support of enum mappings