Creds for 2.0 : new macro CRED_WRAP was added when needed