Update to support nested fields in dot-notation