Update key and token generation behavior and docs