moving parsing logic into Updater