Refactor of dispatch flow, resolves issue #56