Double output upgrade

- Initial double output upgrade
- Fixes crash caused by incorrect calling of proxy and server classes