[Subhas/Faris] Added a mapper class.