Inherited resources refactoring