Add Enum support #635