Moved proxies to a separate file