Add hasMany field support