Added Enum support.