Add DelayHandler to Repository
Removed old event dropping mechanism