Restructured dispatcher