Add marshallers
release 6.1.2