One more change towards event tracking