Updated the keystore generation tool