Add Policy service + Fix permit behavior