Key management modification