Add dynamic group security checks (#2123)