Fixed staging
Added analytics

Signed-off-by: Santhosh IC <santhosh.ic@gmail.com>