changing hasOne and hasMany signature from 'from' to  'for'
resolving conflicts