Move to loaders in delegates.
More clever updater