Adding support for configurable output field