change track schema to fix undefined value issue
better MixPanel tracking
merge conflict