Updated handling of CodeableConcept