Changes to ParseDataRow and ParseFromBelow methods