Added tracking for other classes