M2M relation added, but refactoring needed