Updated: UniverseGenerator and corresponding tools