Updated keys to fit to changes from mahieke.