Better handling of arrays.