Add extended dispatching targets, optimize dispatching behaviour