Use the new keyholder language