Rebuild of Mapping module in D8