Redesigned and refactored resource management