Updated diagnostics to support configurable parameters.