adding in topic support