Proper editing support

Updates #14