Restructured the enums