Added Timeouts for Event Bus