Use refactored marshallers