entity tracking optimizations