Started refactoring of update_artifact