Move add_field to named function, add explicit call to off