Added more sensible marshaller to messages