Added on-demand mapping.