Moved page mapper from variables mapping class to page mapping class