added credential support