Moved HttpRequestFactory logic into Server