Added IEndpointFactory