Moved enums to their own classes