Add list topics to improve performance