Adds topic marshalling