API updates for upstream.