Add user experience tracking
Added some additional events