Added `fields` support for nested fields