Refactor RequestBuilder