Resources refactoring