Add support for readable clients upstream