Added support for dot delimited field names