Resource Management Improvements