Added usage tracking