Added proxy functionality