Fix and move DataTag. Minor updates on field names.