Added new Scan mapper