Better support for pypi