Complete the refactor into PSNjs