Improved usage monitoring