Add more structure