Got rid of request marshallers