Improved resource management