Adding a little more structure.