Added support for analytics