Added on demand mapping to pages