Using predicates instead of EnableHandler