Updated dispatcher to handle taxitypes