Added analytics part