Reworked KitManager