Add reusability to feature generator