Improvements to Structure logic.