Updated page mapping