Added proxy hookup