Separate devices and services in PlaceManager