Made proxies a Map instead of List