More work on the dispatcher