Adding proxy code