Added more plumbing between Room and Editor for editing