Second cut of the new policy configuration system