Various changes to OgComplexWidget and OgMembership Entity