Topic raintime refactoring