Adding notification and analytics