Added first cut of nested fields