Refactored policy