Add more stuff on credential and also the loaders