SW-17. Cleaner registration for eventBus notifications.
SW-17. Cleaner splitting of data.