Fixed featurization so you don't load all data