Satisfy new key storage policy