Major changes (event bus and web components added)