Adds annotations and works on fixing updater