Mapping and Rest Services fixed