Added 'Map' and 'MapTo'.