Add more diagnostic data fields