Adjusted Diagnose store, so it can work with diaparams