Better hanlding of enums.