Update to support new more complex topics