Advanced diff tracking