Add support for more array types.