Adding a bit of structure.