Added a bit of structure