Updated marshallers to allow custom