Minor changes to Structure