Refactored resource system