Refactor dispatcher
0.0.6