Updates to support MEM_SIZE