Add topic tracking