Resource refactoring