Checkpoint checkin
Fixing the issue where when reconstructing the AccessTokenData, certain fields were left off