Changed storage schema