Added more structure