Adding forgotten keys and others