Key value generation added.