Update to match new credential schema