Merge "Update interface to hide Dispatcher"