Mapping checker added