Add raw edit possibilities
Totally remove category kind