Huge source refactor + Improved Updater (was not working at all)