Added persistence for keys.