Adding calling of gather-nested-values when saving