Upstream API changes