Added some more features to featureextraction