Add back @Component to fix UsageServer