MIFOSX-1722 Extend client service to handle identifiers