Rework for Credential lib update