Tweaked for signing artifacts