Revert "Made proxies a Map instead of List"

This reverts commit fbcb085b60edd31d97195570870e79975f7a1699.