Adjustments to internal API, added to memory::