Moved more keys to file.