Added scope support for cib commands