WIP - Improving performance of RequestBuilder.