Add belongsTo and embedded for models