Update to match kcb_skel