Refactoring
EventSubscriber: Do not sleep by default, first check and then sleep if needed
Fixes for auto subscribing handlers