Updated mapping with less relations