Updated Artifact model