Added cancel functionality to multi-layered commands