Adds some more structure