Add keep properties as compound; handle enumeration types in subproperties; add corresponding properties; handle enumeration plus base property type; update dtd