Implement the dispatcher interface

Bug fixes