reorg to support page types