Added proxy and gui handler