Added scope validation