Updated version
Added storage policies for ManyToMany relationships