Change KitManager to be cleaner