Move analytics to the right place