Better handling of loading tasks and loading addons