Moved analytics to separate module