Mapping to match updated Page options