Updated db structure used for pw_policy