Added tracking to comments