added support for agent-forward configuration