Add support for nested fields with defautls