Add named mapping and change interface