Move ClaimsFactory to a top level service