simplify mapper builder always going through addMapping