Added support for one dimensional arrays