Modify API of PolicyManager