Added enumeration values and annotations