#74 Updater CBR - rework
#74 Updater CMO - rework
#74 Updater CMO - fix