Initial support for Analytics