Updated mapping to have standard field