UsageService more robust