Performance counter changes

This should be outside the using