Added support for KK editing #74