[TASK] Adjust modules to let the DISPATCH do the stuff