Refactored group authentication into a pre-filter