Some additions required for memento implementation