Refactored Dispatcher
Refactored Dispatcher