Plain resource refactoring