Refacto pipeline and avoid static