Moved enums to own map