Add suport credential treatment