ResourceBase refactoring