Updated feature extraction + aggregating features