Changing to use topic for hashes, types are now to denote structure of the message only