Use the new PSI elements and methods to make more robust.