Adding basic mapper