(1) Adding more symbolic and change names. Enabled the key generation logic.