Added pubsub proxies for 1x and 2x