added support for analytics