Common: Improved *Dispatcher logic