Added static proxy support