Added Updater support