FORGE-1205: Added @CommandScoped support