+ Add inherited group type
+ Fix up some relationship setting issues