Adds support for upstream backends