restructure PSSELFAdapter and bug fix