[FC] Use class for changes instead of optional old value