FIX: Inject dispatcher directly rather than interface