Enum replaced by a map