More Refactoring of ResourceManager object