Add more function to PolicyVisitor

Add more function to PolicyVisitor