Added additional parameters for diagnosis.