MAASAUTO-17 updations on Analytics class