First version of mapper