Now handling array datatypes better