Added Mapper to replace RestAdapter