Move away from Credentials API