added new fields, updated handling & left placeholder for key generator documentation