Adds origin address to builder
Refactors builder addresses