Tidied up dispatcher class