Fix performance of usage data