Updated key manager again