Changed to bi-directional 1-to-many relation