Niko, let's go bowling

Upgrade for private generation and plan-specific commercial usage rights.