Adding injections and eventbus logic