Update to setup script