Added changes to allow for proxy