Better artifact handling.