Optimize dispatch and notifiers