Added rich joins for manyToMany relationships