added support for nested in fields