Refactorings regarding the Psi interfaces. Not an acceptable solution yet.