Move analytics to include