Refactoring Resource Manager