FIX support for multiple results
Add ArtifactsGenerator support