Update TokenStorage to contain proper class