Added implementation of Agend and Server for current architecture