Added support for new client
Added support for streams with reload() method