New Dispatcher

Dispatcher fix & compatible with all platforms