Only add unique fields with tool