SECURITY REFACTORING