Working on the PLSPM compatibility wrapper