Switched proxy module to branch feature/optional-forward