Added support for nested fields