Feature/gs 21 many to many