Added some sort of structure.