adapt to changes in Diagnostics module