Added page mapping and merged latest from SVN.