improve support for nested fields