Add support for Dispatch and Vimux