Major update to support code kit development