Add MEMORY_SAVING switch