Added arrays to parsing