Implemented updater and various improvements