Added analytics properly