Updated and fixed dispatchers