Added database mapper