Added types for cdsEncounterType and cdsSubTopic