Add Proxy Role and Tweaks