Modern DiD – Modeling Heterogeneity