add topic support