Store and updater out of scope

For merge after #1312