Added waiting for long operations in dispatcher