Support 'univentiongroup' objectclass, small code improvements