added support for topic changes