Refactored and created Resource Manager