Memory Management Improvements