added preliminary PSL support