Handle resolution scopes

@titanous