Working on the --complete-psl option