Adds logic to configure and set origin address