Added support for embedded belongsTo relationships