Adding proxy capabilities