Refactor proxies instanciation