Updated to use new credential system.