Some refactoring and got pipeline working
CV with pipeline working