#252 merging reverse mapping with forward mapping. Fixing reverse check in Mapping.