Some fixes but still getting an "instance already exists" warning.

An attempt at using the same "generic" type for all relationships