update common model; mark SSO server as a barrier; replace identifiers by properties