Finish Updater system, begin integration in the entity system