Improve `Credentials` definition