Add support for array fields