Simplify artefact passing