Add some more structure