More DataParser fixing
Merge