Added new universal tracking code