Memory.hpp updated