Added support for new delivset_field