Dispatcher and bus refactoring
Dispatcher and bus refactoring