Updated generation script, setup.py