Additional Memory Management improvements