Updated dispatcher