Added parsing of Enums