Added more structure information.