Restructured for time/usage based tracking