Added some more features to training data