update enums names and add cancel delegate