Updated analytics part