Better way to verify credentials and credential support