Added Analytics and events