Decoupled the dispatcher to another jar