Adapt to xi-artwork changes