Refactor to provide Common Policy Validation