Editor improvement