Updated to token providers