Upstream API support