Introduced SSO manager, removed locationId workarounds.