Updated dispatcher and commander
More work on dispatcher and notifier