Adding proxy functionality