Add roles and join table