Tweaks to Proxy Handler and Versioning