This thesis contains two essays. The first essay develops an econometric framework that estimates treatment effect in the event-study setup with panel data, while allowing for unit-specific latent heterogeneity that has a finite support. The second essay discusses clustered treatment assignment mechanism and develops a selection-on-observable type approach when the clusters are large and thus the information available at the cluster level is high-dimensional.