Upgrades to use setuptools