Work on OOM and Memory management