Adjustment EchoAgent to work with any agent