Added support for CompensateOnly