Improved pypi generator.