Added array parsing