Added fields needed for logging