Added support for array parsing