Adding support for analytics