Feature/analytics bundle