Update keys and paths