We develop a new approach for estimating average treatment effects in the observational studies with unobserved group-level heterogeneity. A common approach in such settings is to use linear fixed effect specifications estimated by least squares regression. Such methods severely limit the extent of the heterogeneity between groups by making the restrictive assumption that linearly adjusting for differences between groups in average covariate values addresses all concerns with cross-group comparisons. We start by making two observations. First we note that the fixed effect method in effect adjusts only for differences between groups by adjusting for the average of covariate values and average treatment. Second, we note that weighting by the inverse of the propensity score would remove biases for comparisons between treated and control units under the fixed effect set up. We then develop three generalizations of the fixed effect approach based on these two observations. First, we suggest more general, nonlinear, adjustments for the average covariate values. Second, we suggest robustifying the estimators by using propensity score weighting. Third, we motivate and develop implementations for adjustments that also adjust for group characteristics beyond the average covariate values.