Tweak generate script to pass validations