Added more structure to the content