Moved manually added features from auto_features.py to features.py