Fixed get array for strings / Improved map parsing