Updated mapping.yml