Editing support
Editing support #2