Refactored to use Enum40