Update to new setup script method