[MOD] CSV/Json Parsing continued