Resources Refactoring complete so that the locate can be scheme-specific