Added topology listener

Update for beta-testing