added proxy support for builder