Added field nesting