Switched from eventDispatcher to scope expressions