Updates to models for one to manys
Merged conflict