Added more comprehensive content