Added updater class and minor changes