Updates to reflect the last refactoring of the Memory extension