Resources refactoring №2