Added the KeepInMem feature