added topic support