Freebase: Refactor updater