Updated to work for new CarbonKit