Updated policy and value keeper