Update keys and stuff