Updated dispatcher to use the targetmanager