Added support for cancel event