Added analytics concepts to analytics extension