MBS-799/MBS-5919: add more relationship types