Refactored security policy