Integrate diagnostic plots and add combined database option