Updated with proxy and permission