Small changes in DataParser.py