Added support for data-field with dot notation.