Added artefacts dir
Fixed performance issue