Added descriptors for analytics