Latest changes for editor