Proxies support for 2.0.x version
Add user macros support
Add some examples for macros
Add support for proxy and usermacro