Improved Enum handling.