Moved logic from GlobalData to Updater class in logic package