Made perf counter changes (WIP)

As discussed, we'll keep this for now for schema changes cross different samples.