Add the key enumeration
Replace the code by using C99 initialization