Updated imports to moved security code. Also now filtering logical groups.