Updated setup script