Alter CheckIfTracked to use class