Added field arrays to enable testing and automation.