Refactoring of UsageService interface and related domain objects.