Credentials implementation continuation