Updated to match GA release