More classes for analytics