Add enchanced models, one-to-one associations