Updates to feature engineering