Enum improvement in progress...