Updated Key classes.