Modifications for PYPI