Do we have a story to create a dispatcher, so we don't have to have this workaround?