psf refactorization for v06 done and validated