Added more structure code