ENH : removing enum from map (in order to prepare database access)