Add Guard for easier testing
Add :whitelist and :blacklist support