improve artifact collection