Added tracking class