More changes to prepare for authentication.