Added scope support.