Bringing basic structure in line with kcb_skel