Add support for nested fields