TPS tracking + entity type splits.