Issue #8: Remove the dispatch responsiblity from project