Get rid of re-generation of key in update