Extend the demo randomizer