Uncomment namevar code
Add support for setting policies