made credentials information more flexible