Refactoring: introduced ArtifactStage