[Global] Fix Updater
[Global] Adds #67
[Global] Started working on #66