Adding Marshaller and enhancements to message marshaling