added support for deep fields