Added Mapping Class