be more defensive with wrap parameters
allow custom structures in a one-to-one relationship to be nested