Added ability to associate policy with group