More refactorings to support remote resources