refactor code for new using of updater