Modify datbase-mapping structure. Fix in MS the Encap Map Req