Added analytics and commenting