Simplified row collection.
Do not test for model association.
Removed model association.