Further SCIM implementation #2