Added support for array