Fix incompatible comparison
Add Callback triggers