Added custom marshallers