Slight change to structure to all tracking Categories