comment update
Handle complex types for dirty tracking