Add support for credentials