Add more tracking counters