#900 Revamp topic interface (partialy)
#900 Small additions to the interface, and some improvements