Added scope strategy selection