Upstream API change