Possible performance improvements, breaking changes. Changed the dispatcher.