Added some more keys to the dictionary and #defined debug option