Improved Enum support.