Tried adding map for enumerators.