fixing bug if descriptor is unspecified; also adding Enum type