add Topic support (see HISTORY)