More work on updater