Added checks for KS Kits & Fabs