Cater for nested 1-1 embedded fields, still needs check on store manager