Edited EnumManager