Added the server proxy and the cliente proxy