Simplify change handler