More updates for data-vocabulary to bring in line with examples.