adapted to Credentials updates