Using predicates instead of EnableHandler
Merge pull request #367 from gastaldi/enabled_handler_refactoring

Using predicates instead of EnableHandler