added switch classes to dispatch work