Switch to one-to-many association