Added more pages and structures