Add support for empty arrays