refactor xacml tool and scim patch