Updated setup process