Swapped SecurityGuard to bundles