Add memory system support