Added safe map.