Add proxy and unproxy