FORGE-848: Added @CommandScoped support