Added support for empty field arrays in mappings