Added tracking to codementor shield