Goat and Cat

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