Yes, if we change the field name from place_of_service_concept_id to caresite_source_concept_id and caresite_concept_id. This is obviously not backwards compatible, but will be consistent with Omop CDM conventions. Maybe done for CDM 6.x
@christian_reich , why did place_of_service_concept_id break out of the visit table into care_site table when we moved from CDM 4 to 5?