Updated doc and added mapper