More dispatcher overhaul
Removed old dispatch metho