Changed Api args to take separate auth tokens instead of a hash