Added new feature on Analytics