Refactored marshallers