Improved stream editor.