Follow topics refactoring