Moved analytics to xml config