Lot of changes made while adding topic support