Updated to use auth tokens