Policies refactor