Added alternative save strategy