Added option to skip marshal step