Refactor policy