Changes with Kassandra for final changes