Performance improved, Change cancel callback interface