Enhanced usage tracking