Updated KeyProvider