Added more page types