Fixed scoping provider
Enhanced doc