Improved Enum40