Add analytical and some event tracking