Updating member/pool models to have proper one-many relation ...
Merge conflicts