Updated to support disabling KitDLL