Update from generator, simplification
version bump