Dispatcher flush

Issue #36 and #37

Advanced dispatcher flush management