Updated deliver to use new credentials manager