Dispatcher refactoring