Added Mapping and graphs