Incorporated Base Model changes to support new parameters on hasOne, hasMany and belongsTo functions