Re-work of artefacts

Addresses #51