Adds support for array