Track changes with options