Removing interfaces in favour of EventBus events