Rework save strategy for instance with non-local environment