Improved adapters for topics/messages