Handle resolution scopes

@titanous 
I think it's the former.