DS-103 improve parsing