Add support for Array(), Hash() etc