Added "policy=*" nodes, refactoring