Add a few more structure.