Updated setup options