Time for action – adding compensation handlers